1c
Merge pull request #121 from Quak91/master

1c