! #7 for v1.0

Signed-off-by: Antes <antes@simplemachines.org>
Merge pull request #8 from Antes/master

! #7 for v1.0