Merge pull request #1 from felixion/master

Pull all updates
Merge pull request #1 from siq/master

Pull all updates