Merge pull request #1 from melderan/working

Working