Merge pull request #1 from anotheria/master

Updates