merged issue 5 into master (squash 2 commits)