Bugfixes
Merge pull request #8 from mapthegod/refurbished

RC3