Revert "Minor updates"
Merge pull request #22 from rock-core/revert-18-minor_updates

Revert "Minor updates"