Merge pull request #353 from 28msec/master

Merge master
Remove deprecated comment
Merge pull request #354 from 28msec/cleanup

Remove deprecated comment