Merging develop into master for 0.4 release

@andyberry88 please take a look at the group skype chat