tmakatos/sm — pull request #1 by matelakat (2014-09-22 05:19:34+00:00)
Title: Various amendments, suggestion regarding to PR 221

Feel free to pick any of them, or squash them.