Merged pull req #1 from @ssg