Merge pull request #2 from delkopiso/master

Testing production environment
Merge remote-tracking branch 'upstream/master'