Merge pull request #14 from nicolasspilman/master

Refactoring
Getting instances working from build.gradle