additional features & general bug fixes
Merge branch 'master' of https://github.com/Jyang772/Micropenguin
sync