* #2 pull request finished for the current code structure.
Merge pull request #8 from megax/master

#2 pull request updated.