tweaks by andy
Merge pull request #17 from VlikeBanana/jb2

tweaks by andy