closes #1

@carlallen Thoughts?