diff --git a/README.md b/README.md
index f103f31..3264d2d 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ The main advantage of using JuJu are:
 - Install packages without root privileges.
 - Isolated environment in which you can install packages without affecting a production system.
 - Access to a wide range of packages in particular for GNU/Linux systems that contain limited repositories (such as CentOS and RedHat).
+- Architectures available i686, x86\_64 and ARMv6
 
 Quickstart
 ----------
@@ -46,7 +47,7 @@ Just clone JuJu somewhere (for example in ~/juju):
     $ export PATH=~/juju/bin:$PATH
 
 JuJu can only works on GNU/Linux OS with kernel version greater or equal
-2.6.32 on 64 bit architecture (32 bit and arm will be available soon).
+2.6.32 on 64 bit 32 bit and ARMv6 architectures.
 
 Advanced usage
 --------------
diff --git a/lib/core.sh b/lib/core.sh
index f22007c..014619f 100644
--- a/lib/core.sh
+++ b/lib/core.sh
@@ -29,6 +29,7 @@ source "$(dirname ${BASH_ARGV[0]})/util.sh"
 
 ################################# VARIABLES ##############################
 [ -z ${JUJU_HOME} ] && JUJU_HOME=~/.juju
+mkdir -p "${JUJU_HOME}"
 if [ -z ${JUJU_TEMPDIR} ] || [ ! -d ${JUJU_TEMPDIR} ]
 then
     JUJU_TEMPDIR=/tmp
@@ -82,7 +83,6 @@ function prepare_build_directory(){
 
 
 function _setup_juju(){
-    mkdir -p "${JUJU_HOME}"
     [ "$(ls -A $JUJU_HOME)" ] && die "Error: JuJu has been already installed in $JUJU_HOME"
 
     imagepath=$1