Merge pull request #352 from dshurt/master

Master