Merge pull request #5 from wilsto/master

las commit