status update
Merge pull request #66 from spanther/master

Status update