bugfix #305
Merge branch 'master' of github.com:gridguyz/core