Merge pull request #5 from candidasa