Minor changes to avoid possible garbage data bugs
Merge pull request #13 from artfoundry/minor-bugs

Minor changes to avoid possible garbage data bugs