Merge pull request #21 from ChrisBeaumont/master

Small tweaks and bugfixes
Re-implement set_[xy]label