Point args

Fixes #32 

This P/R is based off #34, so it should be merged afterwards.