Issue 1

See #1 

@tdhsmith