fix for back button, issue # 16
Merge pull request #19 from arolan/bug_fix/back_button_fix

fix for back button, issue # 16