Merge pull request #1 from tcsorcs/master

yay
Merge pull request #8 from mdkiemle/master

Merge pull request #1 from tcsorcs/master