Personal touch added, fixes #3