Merge Release 0.0.4 From master to dev

Merge dev to master for release 0.0.4