Merge pull request #33 from sprk/dev

Pull request for Core v0.2.1
Merge branch 'master' of github.com:sprk/core into dev
Merge branch 'dev' of github.com:sprk/core into dev
Merge branch 'dev' of github.com:sprk/core into dev