Fix for #12
Merge pull request #29 from yaronyg/patch-1

Fix for #12
Merge remote-tracking branch 'upstream/master'

Conflicts:
	build.gradle