OPEN - task #104: Bugs Fixing General 
http://github.com/antareja/surabi/issues/issue/104