Merge pull request #12 from apojha/master

[#9] renaming some test vars and making it complient with java 6
[#9] Organising imports