Some re-working.
Merge pull request #5 from ag-csw/master

Some re-working.