Merge pull request #16 from javapathfinder/dev