Version 0.4 complete 020920114
Merge branch 'test-build' into develop