luan Merge pull request #3 from ships/master