Merge pull request #5 from Jari-Ra/master

merge
testing different method
removed alert-dialogs
Merge pull request #6 from neskola/master

Merge pull request #5 from Jari-Ra/master