Merge Pull Request #17

Hand Merged.