clean up code
Merge branch 'master' of https://github.com/arch85/litle-sdk-for-java.git
changes given by Stefan
Implementing the changes suggested by Stefan