Fixed memory issues
Merge branch 'master' of https://github.com/ddperdue/piano