Code Cleanup
Sync testing branch to 0.1.4