Fixed some bugs introduced in previous commit
Merge pull request #19 from edani/jar-fixes

Fixed some bugs introduced in "source jars"commit