Improvements, bugfixes
xMerge branch 'master' of https://github.com/emi420/APIzza