0.4.0

alexanderdean
2014-06-10T14:57:13Z

Merge branch 'develop'