seancoyne Merge pull request #20 from chapmandu/master