Add test for issue #29
Merge branch 'master' into issue-29

Conflicts:
	.gitignore
Fix #29: problem with MacOS blocks notation

This still needs to be tested on a MacOS machine.