Fixed issue #85
Merge branch 'Experimental' of https://github.com/TheFlyingFiddle/ProjectParty into Experimental