Merge pull request #4 from ernstsson/magnus

Added gradle
Restructured instance maker