Version dependancy was not correctly checked
General improvement of code:
- use of Java7 constructs
- fix code hints from static code checkers
General improvement of code:
- use of Java7 constructs
Merge pull request #28 from dizzzz/develop

general improvements of code