bugfixes
Merge branch 'master' of github.com:/andreww5au/teljoy