Added fixes from arsh0r

http://github.com/arsh0r/PyMetaWatch