v0.5.4, 2/5/2014 -- Bug fixes and code clean up