Merge pull request #25 from flubbes/update-1

merge update-1 into roy
Merge pull request #30 from flubbes/update-1

merge update-1 into roy
ADDED LibGDX test
Merge pull request #34 from flubbes/roy

merge roy into update-1