Merge pull request #14 from javapathfinder/dev