Modified API slightly
Formatting changes
Merge branch 'master' of github.com:mlsteele/curtain