Cumulative hotfixes
Merge pull request #6 from ls612/master

Cumulative hotfixes