Merge pull request #18 from domagalski/master

Chris A fucked up