Incorporated changes from integration with a semi-real project
Merge branch 'master' of https://github.com/maaron/jvm
More changeS