Merge pull request #28 from dvicini/master

added back stack
cast bug fix
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team6
tmp