Addressed issues in prev. commit

Please see
https://github.com/flipperbw/HSBuddy/pull/1#issuecomment-44454217 and
https://github.com/flipperbw/HSBuddy/pull/1#issuecomment-44457053