Seneral Merge pull request #5 from Mannilie/master