Added last commits from Pete (master) 09.02.2014)
Fix deployment