more functionality added
Merge branch 'master' of https://github.com/giorgiovinci/amshackathon