<Admin> Fix #14
Merge pull request #27 from Aldream/fix14

<Admin> Fix #14